Fix buildsystem.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/.hgignore b/.hgignore
index c8800a2ff7195385dd149108346e86093c2f883f..1bc1a669575b3be25dbba0ec65abc70ec62d9371 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -13,6 +13,7 @@
 .*\.flc$
 .*\.orig$
 .*\.rej$
+^.valid-srcs$
 ^TAGS$
 ^dist/.*$
 ^docs/.*\.aux$

diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen
index 8cd833bc383fe86c80ff6a22caa5e041b5d1acc1..3a44387f22eaaa3fa276c24274db7a88566621ab 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xen
+++ b/buildconfigs/mk.linux-2.6-xen
@@ -3,6 +3,8 @@ OS           = linux
 
 LINUX_SERIES = 2.6
 LINUX_VER    = 2.6.16-rc1-git4
+LINUX_SRCS = linux-2.6.15.tar.bz2 patch-2.6.16-rc1.bz2 patch-2.6.16-rc1-git4.bz2
+LINUX_PDIR = linux-$(LINUX_VER)
 
 EXTRAVERSION ?= xen
 
@@ -20,15 +22,17 @@ build: $(LINUX_DIR)/include/linux/autoconf.h
        fi
        $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR) install
 
-pristine-linux-%/.valid-pristine: override _LINUX_PDIR = linux-$*.16-rc1-git4
-pristine-linux-%.16-rc1-git4/.valid-pristine: linux-%.15.tar.bz2 patch-%.16-rc1.bz2 patch-%.16-rc1-git4.bz2
-       rm -rf tmp-pristine-$(_LINUX_PDIR) $(@D)
-       mkdir -p tmp-pristine-$(_LINUX_PDIR)
-       tar -C tmp-pristine-$(_LINUX_PDIR) -jxf $<
-       -@rm tmp-pristine-$(_LINUX_PDIR)/pax_global_header
-       mv tmp-pristine-$(_LINUX_PDIR)/* $(@D)
-       @rm -rf tmp-pristine-$(_LINUX_PDIR)
-       bzcat $(wordlist 2,$(words $^),$^) | patch -d $(@D) -p1
+.valid-srcs: $(LINUX_SRCS)
+       touch $@
+
+pristine-linux-%.16-rc1-git4/.valid-pristine: .valid-srcs
+       rm -rf tmp-pristine-$(LINUX_PDIR) $(@D)
+       mkdir -p tmp-pristine-$(LINUX_PDIR)
+       tar -C tmp-pristine-$(LINUX_PDIR) -jxf $(word 1,$(LINUX_SRCS))
+       -@rm tmp-pristine-$(LINUX_PDIR)/pax_global_header
+       mv tmp-pristine-$(LINUX_PDIR)/* $(@D)
+       @rm -rf tmp-pristine-$(LINUX_PDIR)
+       bzcat $(wordlist 2,$(words $(LINUX_SRCS)),$(LINUX_SRCS)) | patch -d $(@D) -p1
        touch $(@D)/.hgskip
        touch $@ # update timestamp to avoid rebuild